merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 26 May 2006 19:41:49 +0000 (13:41 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 26 May 2006 19:41:49 +0000 (13:41 -0600)
commit7a3587d6e5e8d46e96204ada7df0d77cbc78f640
tree894006b6bb40f24ebe05201fab9cedfd49009338
parentdd738619dd030c6293fd3c045d0d82e615a8e6c6
parentc263397874afd0a5b7ae71b562d879addda97294
merge with xen-unstable.hg